Pass the correct crt-dir to ./configure for multiarch.
authorRob Browning <rlb@defaultvalue.org>
Sat, 8 Oct 2011 03:54:21 +0000 (22:54 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sun, 23 Oct 2011 06:21:40 +0000 (01:21 -0500)
Thanks to Sven Joachim <svenjoac@gmx.de> for the report and the patch,
and thanks to Philipp Kern <pkern@debian.org> for the 23.3+1-1.1 NMU
which included the patch.

Closes: #629567
debian/rules

index ef19af7b3a1e9d8ad384fd98b80ed3e681b5aab9..9dc28d0164ce24473fd8836dea86b11b2a8d4503 100755 (executable)
@@ -166,6 +166,8 @@ else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 LDFLAGS   := -g
 CFLAGS    := -DDEBIAN -g
 
@@ -433,6 +435,9 @@ confflags += --mandir=/usr/share/man
 confflags += --with-pop=yes
 confflags += --enable-locallisppath=$(local_lpath)
 
+# multiarch compatibility
+confflags += --with-crt-dir=/usr/lib/$(deb_host_multiarch)
+
 # x configure flags
 confflags_x := $(confflags) 
 confflags_x += --with-x=yes